From 658a736299f7c91b7db1e1c12b01cc8b8f232fa8 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 4 Mar 2014 10:59:44 +0100 Subject: [PATCH] x86/AMD: re-use function wide variables in init_amd() Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/cpu/amd.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 904ad2e274..08ec56ac79 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -399,13 +399,9 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) * revision D (model = 0x14) and later actually support it. * (AMD Erratum #110, docId: 25759). */ - unsigned int lo, hi; - clear_bit(X86_FEATURE_LAHF_LM, c->x86_capability); - if (!rdmsr_amd_safe(0xc001100d, &lo, &hi)) { - hi &= ~1; - wrmsr_amd_safe(0xc001100d, lo, hi); - } + if (!rdmsr_amd_safe(0xc001100d, &l, &h)) + wrmsr_amd_safe(0xc001100d, l, h & ~1); } switch(c->x86) -- 2.30.2